Bug 555724 – gtkcellrendereraccel not initialised correctly

svn path=/trunk/; revision=21641

diff --git a/ChangeLog b/ChangeLog
index 078ea11313d6233c2ef13b5b386f1bd079504910..e18d38fc12cf14f87d452b0e2d553cff3a1821d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-13  Christian Persch <chpe@gnome.org>
+
+       Bug 555724 – gtkcellrendereraccel not initialised correctly
+
+       * gtk/gtkcellrendereraccel.c: Initialise the cell text.
+
 2008-10-12  Simos Xenitellis  <simos@gnome.org>
 
        Bug 555625 – Updated gtk_compose_seqs_compact table 

diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 0a5375068ee250c52e336abdc4bc765cf1af5772..1142cd94fc508fca3625ecc5b586957482f46eac 100644 (file)
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -52,6 +52,10 @@ static GtkCellEditable *
                                                   GdkRectangle    *background_area,
                                                   GdkRectangle    *cell_area,
                                                   GtkCellRendererState flags);
+static gchar *convert_keysym_state_to_string     (GtkCellRendererAccel *accel,
+                                                  guint                 keysym,
+                                                  GdkModifierType       mask,
+                                                  guint                 keycode);
 
 enum {
   ACCEL_EDITED,
@@ -74,6 +78,11 @@ G_DEFINE_TYPE (GtkCellRendererAccel, gtk_cell_renderer_accel, GTK_TYPE_CELL_REND
 static void
 gtk_cell_renderer_accel_init (GtkCellRendererAccel *cell_accel)
 {
+  gchar *text;
+
+  text = convert_keysym_state_to_string (cell_accel, 0, 0, 0);
+  g_object_set (cell_accel, "text", text, NULL);
+  g_free (text);
 }
 
 static void